Refactorings in imports and in generation of guards.