Cleanup of last goto's.