Fix amnesia where/match support.