Tweak to please OpenJDK 1.6's javac