Misc grammar improvements
Update rlex and rparse