even more range_of tweaks

From-SVN: r275590
3 files changed