Tweak to try and eventually please OpenJDK 1.6's javac