Parser cleanups