Move to requiring Java7