Improved generics that were useless and caused compiler errors on Java 1.6