Compiler suggested cleanups
9 files changed