Move mzlib/restart back to fix build.