Fix bug where two matches against different step macro can insert both sets of steps