Cleanups in handcrafted parser.  Starting to implement it for real.