Continued CUP/JFlex migration