Misc input related changes to facilitate upcoming merges.
3 files changed