The comment already said there could be 2 dead letters, but the log assertion failed when there was a second 'excess' one. Add a flag to skip checking for excess log lines.
cca1c20d93