Not really satisfied yet.
Adjust dump-timing to ignore the extra data, for now. Also do some general instrumentation cleanup.