more (nearly done with this round) of TRAITS/Range<> changes