Removing the GOTO. For shame, igorw. For shame. ;-)

Was working on this before the big issue #3 discussion. I think it is marginally easier to maintain, but far less fun to talk about.