More myrimatch fixes.