Improve merging of property definitions.