Java 7-ifying