Add output variables for the matchers as well.

At least their command line settings so far...