Better support Redis on ports other than 6379. Also improve the anti-clone.