A little reorganization.
More reorganization, adding the necessary imports.