Performance optimization now that Proxies are a bit smarter.