More fixes to use getType rather than directly look up the propertyTypes dictionary.