Tiny changes for Java 7 and Eclipse 4.3.