Switch to Citrus for parsing, rather than basic Regexps.