But I do agree with your modularity argument. Just, that would require another PR into commcare-hq and, well, not now...