Update grammar to be more VEX friendly