Avoid a couple of dependencies on input.c internal variables.

6 files changed