Introduce a no‑risk safety layer so the refactor can be merged incrementally without breaking downstream users or tests.