More replacement preparation for the object flag apocalypse