Fixed the parsing errors introduced in the re-write.