Make code compilable with rustc revision 7d7e409