Fix C89 incompatible mixed declarations and code introduced by 220a7d4b.