fixing up expression productions in grammar