remote-hg: reorganize bookmark handling