Fix nightly fallout

Using rustc 0.13.0-nightly (5484d6f6d 2014-12-02 00:22:00 +0000)

This is in progress, anybody welcome to contribute :metal: