I had to xfail one existing test case (class-implements-int) because, I think, of the same bug described in #2272.