Improvements for updates, per the comments in gh-5296. Fixes #5319.