More compiler identified cleanups
5 files changed