My advice: in the 2.1 series, leave that code as is, especially as we're close to a release. It's too easy to brake it.
The current code does not pass all the tests. Since we have a testcase, I suggest (and volunteer for) doing the simplest thing that could possibly work and pass all the tests. It should be a handful of code lines, so there's no point using regexps or something from Excalibur (the less we depend on it, the better). JFDI ;-).
Ugo
