small refactor

depends on https://github.com/dimagi/dimagi-utils/pull/75/