Better modularization (and compiling).