Fixed up parsers.
Better tokenizer.