These will likely diverge in the very near future, so I'd rather keep them separate. For instance, I'm having trouble deciding if it makes sense to do averaging or standard deviation math functions on histogram data.