Revert the ‘return’ part of 6edcbed6

The gotos were jumping over initializations, causing
C+++threads+debugging to fail.