Added test and code to prevent whitespace from occuring within []-delimited tokens.