changed the hashmap types for idsToBeReplaced to Id -> Set[FeatureExpr] to avoid having duplicates in the key values. This fixes an infinite recursion which appeared in top.pi (busybox)
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup