Commonise (and clean up) large chunks of the engine manager