Get rid of that hideous goto

I'm not overly keen on the continues either :-)