adding support for whitespace around delims