upstream rust changes; elide some lifetimes