Another attempt at pleasing clang