I agree with the principle, but I am a little worried about normal ordering affecting the ``` !policy_server::" variables here. Can you please check on both a node and a policy server that this works as expected, without having to manually force classes to do the right ordering? Please confirm when done, and we'll merge then.