Mention Björn Kautler contribution.
Move classes out into enclosing class with no super class to see if that makes the IBM JDK happier.