Removed dumb-ass assumption in parser.rawparse() function