Please Review: (699815) Fix Coverity code maintainability issues