WINDUP-152 map in props

See the jira. Core reformat if okay to merge.
I originally had that, but here the mapKeys are being removed if they were in the original set, so I don't remove all. I assume graph operations are more expensive than map tree lookup.