Change the return type for string matches to be the array of parts