It seems that one of the hair-raising regexps that Carsten manages to come up with is not quite right. Try this patch for now:Hmm, it still does not seem to work for me, but I might not have changed the files correctly.
Please ignore the above. Nicholas' patch works as described. I'd just forgotten to bite-compile ex post.
Thanks Nicholas.