Added "boolean" token to facilitate rule in changed CFG.
Fix rules to reflect changes in grammar