Issue #116: New grammar