Update to take advantage of Java 8 intrinsics