More Java 8 cleanups