Fix new parser issues

Closes #41.
Closes #42.