The attached patch implements this latest "propname+" suggestion. When applied it results in the behavior shown below. I'm inclined to go with this as a solution moving forward. Thoughts?