Make pylint mostly happy