Refactor match into DidMatch and NoMatch

Save that extra pointer to [][]int for the match indices