Small changes to make gcc/gfortran happier.  Not enough succeed.