Tweak to reflect database->datastore refactor in wl2