Fix for rustc update 2014-12-15

Get it building yet again.