Fix lifetime parameter shadowing on rust master