Made the clang compiler a bit happier again today