Move to more Java 8 idioms like Optional.of(T)