[BZ 1069545] Fix type merging to support updates to subcategories.