More changes to be more idiomatic Java 8. I think.