Removed redundant to-dos in parser.