Java 7 changes and some minor cleanup. [1423]