Remove last bits of Java 1.5 compatiblity.
As we compile for Java 1.6 anyway.