Add support for whitespace between tokens