Fix some straggling JDK6 issues.
Merge pull request #29 from rankinc/tidy-up-jdk6

Fix some straggling JDK6 issues.  Reviewed.
Merge branch 'master' into cauldron