Changed signature of MatchStep: now emits a name,value map for each solution