Update for modular_bootstrap compliance.