Avoid pulling in std::tr1 if possible.

TR-1 shouldn't be used where it can be avoided.