Java8ification progresses...