remote-hg: shuffle some code