am 137c819e: Merge "Remove some more gotos"

* commit '137c819e16b757478807d89c4ac40d0b9dad6737':
  Remove some more gotos