Check if https://github.com/rust-lang/rust/pull/42913 allows some simplification

[dzamlo]

I recall that at some point I concluded that the fixes introduced by rust-lang/rust#42913 could simplify part of the code of this crate. I don't know if this is still the case.