Simplify Diff

Workflow

• Review the provided file/snippet and the existing change intent.
• Inline helpers, remove redundant logic, and keep behavior identical.
• Avoid unrelated edits and keep the diff minimal.
• Summarize the simplifications made.