More changes to support a handcoded parser.