am 34671b81: Merge "Remove some gotos"

* commit '34671b8100131b5a4f07f4dceac53a007497bc52':
  Remove some gotos