Fixed shadowed lifetime. Fixed unused mut.