Issue #28835: Tidy previous showwarning changes based on review comments.

Patch by Serhiy Storchaka.