Clarify comment wording.
Merge Traits and Comp template parameters into a single parameter named Traits, and adjust much code accordingly. Rationale for change is that indexes are going to need several additional function object types, and that becomes unwieldy. Better to fold them all into a single Traits, more along the lines of string and iostreams traits.