Remove dependency on JDK 1.7.
Progress.