better whitespace expression

I had missed one place in previous commit--the end of the syntax region matcher.  Also I switched all the white space expressions to the one you had suggested.