- Issue #9: Grammar Changes