Clean up syntax for some scripts.
7 files changed