These still need `|| die`