Fixing minor issues with parser. Incorrect tokens
being adopted, or things being adopted out of order