Several cleanups from Larry.
2 files changed