Fixed several places where a value was uselessly (but harmlessly) stored to a variable but then overwritten shortly thereafter or just never used. Where possible, my favoured solution was to declare and initialise at the same time, instead of K&R C style declarations at the top of the function.

Change-Id: I87f6a35d64ed28ef1c89e282ac36ffab5fa522b3