- More m_connect cleanups, I also never liked the idea of temporarily modifying
  a connect item, so let's do this a bit different now.