Rearranged edit-scope-limitation. TODO: fix removal.