Parser cleanups for Java 8