Fix warnings for shadowed lifetimes

Shadowing lifetime parameters on an impl with lifetime parameters on a fn will become an error before 1.0