More proxy refactoring.

Trying to figure out the next major chunk of work by slowly
cleaning up and making more sane.  Also, live testing.