[#67039938] Final rationalization of categories and their fields.