Revert some code to Java 6 style so the class diagram can be generated properly.