Work on goto rewriting