Some minor variable and flag cleanup.
5 files changed