Simplify dependencies, speed up assembly.