Refactor a file with zero behavior change

Refactor $1 with zero behavior change using the interface-design skill (find it with skill_select, then read its SKILL.md). Trace callers and run baseline tests before editing. Prefer deletion over a new abstraction; preserve compatibility. Make the smallest useful change, then run focused tests and required repo checks.