small parser cleanup