Adapt for the new run-db code.