Update grammar so that macro names can contain the _ character.