Merge pull request #1424 from airspeedswift/2-range-2-countable

Restore two more instances of CountableRange