s3: Make sure our CLEAR_IF_FIRST optimization works for messaging.tdb