Improved category parsing.