Fix a bug in the parser; tests now succeed