Neutral refactoring of schema.
Ensure that we explore only delegated roles trusted with the desired target.