Merge "Remove some more gotos"