minor: Manual debugging instrumentation of failing AddRemove test
Refactor: factor out logging functionality.  Next step.. replay.