Update to reflect the last batch of proxy stuff we got from Justin Bradford.