Now all cleanup code at the end of the function is gone so there's no
need for the gotos anymore. Just return directly.