Make RPC registry more derp-proof