[modules] Work around mislayering of MC / Object.