Fix #151; Java 7 -> 8 compatibility.