More tedious parsing bugfixing.