Changed TagDescriptor factory methods back to simple constructors.