Finish inverting the MC -> Object dependency.