Tidy up Storable requirements to match where the module is used.
Defer loading of modules until after processing overrides.
Import several bug fixes, including fixing a coincidence correction factor bug that affected %-clean132.