Improve proposals for properties.

Change-Id: I73a209a77cb05bbf5329b8250797781dae976ec7