C89 build fixes.

Recent changes introduced a couple of non-C89-compatible mixed
declarations and code.