"Unshadowed" a variable (7 to go ...)
Updated timestamp to reflect cherry-pick