set/(re)move a few cases of set_category and set_subcategory
(cherry picked from commit c18234129799ab96dec1b1d45373d3f0d5dd9bf3)