Typedef rc.cup changes