Improve property type handling.