Extract being less verbose until explicitly asked for.
Make comparison stricter.
Merge pull request #5353 from dereuromark/2.6-verbose

Extract being less verbose until explicitly asked for.