minor parser cleanup