Java 7+ changes and some cleanup. [1423]

This is actually a test of the automated per-commit builds.