[WIP] Fix code based on comments in review thread

[Copilot]

Thanks for asking me to work on this. I will get started on it and keep this PR's description up to date as I form a plan and make progress.

@copilot Fix the code for all comments in this review thread.

When a review comment includes a suggested change, apply the suggestion exactly unless the instructions in the 'Additional instructions' section below indicate otherwise.

Do not make changes beyond what is described in the linked review thread, unless requested in the 'Additional instructions' section below.

[Copilot]

Copilot was unable to review this pull request because there is no eligible user to bill. To allow Copilot reviews on bot-authored pull requests, enable direct organization billing in your organization's Copilot settings.