Don't get tricky with reusing variable names.

Change-Id: Id10cfa6032def4f3190791fefcb11238f2fb1ace