Add more generous matching options for basic capture groups.