D'oh, was too caught up in regexes ;P