Suggested improvements for WIP #4161.