Update the CellTypeToType converters to use new cell tags
Remove unneeded include.
Update algorithms to use the new cell tags.