Fix underscore build modifications to `match`.