This is a great improvement.  Thanks for making it.

LGTM after above changes.