More cleaning.  no implicit through papi.F90.  Validated.