Yeah, I think it's less readable when tucked inside the regexes. Patch looks good otherwise.