Use Java 7.
Cleanup. Mostly use of Java 7 constructs.