outdated: Fix some parsing bugs.