Eliminate Thrust's use of the categories inside iterator/detail/universa...

...l_categories.h

Fixes #520