RF: misc pylint-based minor changes