Bug fix: Leading and trailing white space weren't removed in scan tokens.