Reliably close streams in a few corner cases
Trivial inspection fixes
Use Java 7 language features