Code Cleanup: ErgFile

.. XXX is a suggestion not a TODO.