Follow-up to keeping os_base static.