Refactor in-range to in-inclusive-range when possible
#376
+52
−1
in-range to in-inclusive-range when possible
#376