GrahamA: surgically remove parts of findbugs that intern xclass stuff, for issue #16.