Fixing up some imports to make ReadTheDocs happy.