Short: patches Match*() functions in 2.0