Re #7311 Tweak tool tips and minor refactor