[release-17.0] Miscellaneous code modifications based on observations made while doing a code walkthrough (#12873)#13280

frouioui merged 6 commits intorelease-17.0vitessio/vitess:release-17.0from

backport-12873-to-release-17.0vitessio/vitess:backport-12873-to-release-17.0Copy head branch name to clipboard