Added combo items in a more intelligent way.
Fixed a bug in getTypeFormatTextString, and then made the two static functions regular methods to get them out of the header.