Cleanup. Avoid relying on specialization of std::distance.