Rewored interception proxies to be more consistent