Remove superfluous else branches

These "variable = nil" initialisations happen automatically.  While its
not much that is gained from that now, let's not create bad examples to
follow.

Change-Id: I48134f418a691e95679e95e742c31f8b13f3f79d
Merge "Remove superfluous else branches"