I think I'll expand the regex I check already to include a capture group and use that if the regex matches.