Last set of trivial fixes for "no previous declaration" warnings.