Fix a number of cases of new pylint test failure.

[KSchopmeyer]

Fix several cases where pylint reports possibly-used-before-assignment because a variable was not defined in all if/else if statements but used after the if ... sequnce.

Marked as rollback needed since this will appear in pylint run against earlier tag