BEGIN/END markers; various minor code tweaks.
Merge branch 'master' of https://github.com/IanDarwin/javasrc