sh: Remove more gotos.