Java 7+ updates and cleanup. [1423]