Changed to javaCC 5.0