Added more delimiters, including those used with CJK