@lightsofapollo has a patch that factors _commonSync out into its own class.  In the interest of reducing the bit-rot conflict he runs into and any code archaeology, can you just quickly un-indent this so it's ugly but there's no set of giant hunks?  (I assume it's as easy in vim as it is in emacs.) Thanks!