2. Cleaned up the main parser loop considerably; the RawKeyword instance now itself knows whether it is complete or not.