Minor tweaks where JFlex and CSLex differ