Mini-cleanup
Not very far.
Log extradata, if any.
More extradata testing.
Almost there.