tweak
Include ack column in scans when configured.
Hoist common bits to simplify some tests.