Fixed various JavaCC bugs.