re. !76498 : Clarify code so cppcheck 'sees' there is only one move of each variable; it is not duplicated.