A few more bugfixes in parsing.