Use JDK 8 language features

See parent issue at #181