Fix variable-shadowing warning that's new in VC14