Categorical fixups

Some fixups for Categoricals.

Fixes: #3678
they are both Indexes (at least in the currentl impl) - they don't necessarily have to be but they are