Grammar tweaks and operator fixicity/precedence modifications