Issue 5744: Follow-up updates.