removed commits from grammar -- these seemed to be producing
non-deterministic errors
@leaf working
attribute test more in place