Restructuring to reduce the coupling between the database benchmarks.