Explicit whitespace distinction

Whitespace is not included in productions because it makes a mess.