|How about using a goto on the error path to clean up properly
|instead of the different return sections.

.. here goes Take 2: