[core][apps] Some refactoring per clang-reported warnings (#3019).

[core][apps] Some refactoring per clang-reported warnings (#3019). #1957