[compat] Modernize