Cleanups to proxy code: greater robustness in receiving proxy data,