[Refactoring] Checked all the @SuppressWarnings and a) removed those that weren't needed, b) fixed up the easy cases and c) tried to move annotations from the class level onto the methods that cause the problems.
[Refactoring] Fixed for Java 6 compilation failure