We were getting around the issue by importing when it was needed, but
now that pylint complains it's a good opportunity to clean the code a
bit.