s/tuple/`Match` struct/

Also, the `HACK...`, would conventionally be `FIXME #13703 ...`.