core: Use single definition rule for cell-type.