Patched issues with delimiters after values w/o whitespace.

This is a hack. A fix for the root problem is pending.