Polished Java 8 support.