All randomize options made consistent with using -z option