go: Eliminate some more goto statements