More clang cleanup - refactoring in prep for merge.