Revert "Fix shadowed lifetime warning."

This reverts commit b2fe9451c88cbe56ce992f6e066280198405320b.
Revert "Revert "Fix shadowed lifetime warning.""

This reverts commit 7859140d021e4e86ee1b0ac067e352946c274a00.