Minor refactoring of set_flash matcher.