Change grammar to not require ';' after nested rules