Merge "Remove some gotos"