Some cleanup to remove bits I left lying around while refactoring proxy support.