More Java 1.6 compliance changes.