Add some more match group outpu variables.