Cleanup and fix for clang.