Change the content of the value returned to include optype, and
per-operation key and value.
Clean up and fix warnings.