Move the helper wrapper on window changes so that it's used by ServerWindow
Move the helper wrapper on window changes so that it's used by ServerWindow

This helps consolidate a lot more code, and we clean up our API as well.

magcius/xplain,magcius/xplain