Remove now-unnecessary lifetime annotations