Restructured change_tracking_map_t safety checks