m_connectban Don't depend on the definition of clonemap
Rewrite clone counting to use one map instead of two