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

* commit 'd3bccfcfea60c9c3171f3577579ce7905c833935':
  Remove some more gotos