More java8 simplification.