Changes for rustc 0.9-pre (d2a4a10 2013-12-27 23:06:49 -0800)

I've made changes to use with 0.9-pre.