Non-Commit grammar updates