Prep for PermissionAdder extension point in 1.535.