gh-29 server side delimiter: review fixes