Refactored some goto uses.