Fixes #240 SPATIAL KEY support, fixing reversion from reserved refactor (2575f3c)

The reserved words refactor resulted in a reversion.  The parser generally needs cleanup to bring it more tightly in-line with the spec while making it cleaner.