[WIP] Update for rustc

This first commit fixes the ICE, but I've got another problem behind.