Multi-phase remediation plan: finish the half-migrated abstractions (architecture review 2026-07-06) #6233