Address a few issues pointed out by pylint.