First Java 8 changes (refactoring).