TODOs, notes, finalizing variables, this'ing stuff in MatchStep.