Fix variable name clobbering from previous patch.