more clang-inspired cleanup