Category infra

Fixes #345
Shouldn't be required now that we're not using it.