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

This reverts commit a1c7d4849a859f4142974aebb91e187d5213493b.
All control flow seems to be generated. Wohoo!