Refactoring subcategories after merging with the latest from Discourse.