I'm going to have to really study this regex to understand what it's doing and whether that's what we want it to do. I can't do that now, but will put it in my queue of things to do.