Add an OwnsAttribute lock.
Remove some unnecessary authority_of blocks