More cleanup in parsers