I'm thinking you are probably right now. The idea was to do something relatively generic but that doesn't seem to have held very well across the other reports. I thought I'd like to leave this for now and then revisit after we have seen  a few more cases.