Fix some checkstyle violations, cleanup.
Drop Java 6 compatibility.