Fix still more static-declaration-vs-nonstatic-definition glitches.

gcc doesn't think these are a problem, but somewhere out there is a
compiler that will spit up.