Issue #3496505: Fixing more static analysis issues, and ignoring those regarding deprecations, which will be removed as we refactor.
Closes #3496496