Added support for multi-character expression-delimiters.