Some of the feedback was also relevant to other files, and has been applied there too.
distance
ranges::contains_subrange