Improving splitQuery method.  Fixes #22
Using class constants for token types and token components now.
Resulted in a ~35% reduction in memory use and a slight decrease in performance.