Changes per feedback from Sam, re: expose Grammar options