Are these two comments still appropriate? "handle the situation where the inherited make has been moved" sounds like something which might be on people's "nice-to-have" list.