Merge pull request #1159 from rick/be-consistent-be-be-consistent Make `goto cleanup` more consistent