Clean up local variable usage - misc functions

A catch-all for a bunch of smaller functions

Change-Id: I3f97a514f9964ef36bff2f24a2f0a98614871a9f
Merge "Clean up local variable usage - misc functions"