Remove delimiters when parsing empty parameters.

Redone the delimiter-patch based on the v2-branch.