Treat "GROUP BY" and "ORDER BY" as single keywords

For now: preserve the lenient behavior of parsing / splitting in case just
"GROUP" or "ORDER" is encountered.  May not actually be necessary.