Removed dependency on zse-opt.