Make the project actually compile and remove a Java 7ism.