Removed usage of Java 7 features.