updated MatchableStep.match() and removed matching code from StepMatcher