[[ Bug 14044 ]] Refactor do ... in caller