Incorporate fix from japaric for cross-crate ICE