Fix some straggling JDK6 issues.

I don't know whether I missed these first time around, or whether git reverted them during an automatic merge. This commit just tidies up some loose ends.