Fix lint warnings (in parser finally too)