Issue Number: close #xxx
This change is a trivial rework / code cleanup without any test coverage.
(or)
This change is already covered by existing tests, such as (please describe tests).
This change added tests and can be verified as follows: