Done. I had trouble rewriting regex first time over because of the preceding group. Works if it's made non-greedy.