Eliminate MatchedVar (was hack for NaBL/TS and not needed for manual analysis).