BaseParser: two minor changes