COMP: Eliminate some level 4 warnings

When building our project with level 4 warnings and the Visual Studio 2012
compiler, we were getting several C4701 ("potentially uninitialized local
variable") and C4702 ("unreachable code") warnings.

This commit eliminates those warnings.

Change-Id: Idc35e8de30c80a19d1a961bb17b1a865a46c0612
Merge topic 'eliminate-some-level-4-warnings'

43efb178 COMP: Eliminate some level 4 warnings