Some goto refactorings.
Some goto refactorings.

flurischt/jedi,WoLpH/jedi,flurischt/jedi,dwillmer/jedi,WoLpH/jedi,mfussenegger/jedi,dwillmer/jedi,tjwei/jedi,tjwei/jedi,jonashaag/jedi,jonashaag/jedi,mfussenegger/jedi