Adapt the processor-related categories.
Merge branch 'master' of https://github.com/expath/cxan-master