WIP
Cleaner grammar extensions