Proxy-related code-review cleanup.