4737.   [cleanup]       Address Coverity warnings. [RT #46012]