Mess with parser some more