Re #6516 minor tweaks