Fix: a couple of minor parsing bugs.