Using ./sage -fiximports from #34945.
Also remove trailing whitespace in the affected files.
Part of Meta-ticket #34201
CC: @alexchandler100 @jhpalmieri
Component: refactoring
Author: Alex Chandler
Issue created by migration from https://trac.sagemath.org/ticket/34953