Another improvement for the dustmite output match logic.