Rework atom locality validity checks