Shuffle some things around to deal with the pre JDK 8 builds.