More fixes, though parser is destroyed.