Some core changes to accommodate module loading modifications. Can't
totally recall what was completed here.