Minor improvements to import statement formatting.