Second attempt at JDK6ing the project (missed a whole bunch of stuff last time.)