There's no need for || die in EAPI5 for e* and do* functions.
Fixed in 1a46cf7aed4d6b1d50acdcf7ec8fd0bb8c5a28b2