Include change to Terry's Java.g4