Tidy up jdk6

And it look like these two commits were added to the jdk6 branch after I merged the jdk6 branch into the unit-test-jdk7 branch. (Git is so complicated!)

Hopefully, this is everything preceding the jdk6-generics branch.