Fix for rustc changes.