Finished switchover to scene::data and scene::dirtyProp!