Grammar refactoring
Need to explicitly match final EOL