Improvements suggested by @mhvk

[ci skip]