SyGuS grammar refactor (#3100)