Finished migration to JFlex+CUP