Fix extra java 1.6 failures... that only happen with -source 1.6.  Go figure.