@shakedown oops, it looks I left some comments in here, and forgot to add the defmethod for `:store-report 2`.  That also probably means that the command tests for this are not using version 2.  Everything else should be OK, I think.