Continue fixing benchmark -- almost done.