Incremental updates for compliance with gcc/gfortran checking.