Fix some straggling JDK6 issues.