Fix or comment out a few Java 7isms.