Update to work with current rust master

 * zero.rs is not needed any more
 * use std for fixup.rs