Review of #1926

Suggested tweaks to #1926