Doug code review reversals: rewind changes to explicit type declarations.

Implicit type declarations are not required, explicit ones are ok.