I agree.  But we should defer this to a later PR. I'll discuss it with in #croogo