Replace uses of number-tag with number-type.