Please Review: (688341) Fix Coverity code maintainability issues