Imports fixes from an overeager "optimize imports"