Also encode delimiters if necessary