Clean up ModuleInitializer a bit.