am 418dd72e: am 137c819e: Merge "Remove some more gotos"

* commit '418dd72eb7d0c5b6a4eeadb37493cffa78103bfb':
  Remove some more gotos