[ET Trac] #2431: review changes required for gcc-10 / gfortran-10 readyness