parser: cleanups