In the process, remove the ImplControlProperty struct,
 since it was duplicating information already stored in the
 key of the map.