for some reason regenerating with JavaCC moved a method - perhaps due to a different version of JavaCC - commit using JavaCC 3.2