More fixes to use getType rather than directly look up the propertyTypes
dictionary.
Merge pull request #595 from shans/moreFixes

More fixes to use getType rather than directly look up the propertyTypes dictionary.
Merge branch 'experimental-rebase' into experimental