Modernize, simplify.
Various modernizations
Merge branch 'master' of https://github.com/IanDarwin/javasrc