Deprecating old match code and introducing the new match format.