More Java 8 goodness.
Minor goodness.