OMG redo everything for rust 0.11

I'm pretty sure this is no longer pretty or good; but it does its job
again.