ModuleDeployer cleanup

Not quite XD-1020, but makes things a bit clearer still IMO