librustc: Fix even *MORE* merge fallout!