Fix two parser bugs: bug 41 and bug 529. For the former, I replaced