Unqualify local variables

Change-Id: I8d2408830075b561290e592deb8043d249b09bd8