Style cleanup on importers.
Style cleanup on libraries.