Man, this is so much better! I love regex, and I'm ashamed this didn't occur to me before haha. Thanks!