Getting rid of goto.