Cleanup for handlerton structure to allow for loadable engine work. This is the first in a series of patches.