Re #6371. Further improvement to error messages.
Re #6371. For now, need to keep even unchanging logs.

Pending resolution of #6886.