Review the recent code changes and simplify the implementation without changing behavior.

Prefer removing unnecessary abstraction, duplication, and indirection. Keep the code clear, idiomatic, and focused on the requested behavior.
