Better handling of surrounding delimiters