Re #353: Handle unloaded units being referenced outside factory * Remove inheritance prior to creation of more generalised sub-factory inheritance * Create helper class that contains the only common code from old inheritance to keep duplication down