Drop code compliance to Java 1.5. Minor annotation changes for 1.5 compliance.