More modularization, less duplication.