Adding whitespace trimming to category mapping for good measure, although no test cases found.