Improvements to match/multi