Updated grammar to tolerate whitespace.