Made sure '_' is used as a delimiter and hacked in UTF-8 support for checking some unicode delimiters.