Merge "GCC doesn't like {}, and clang doesn't like {0}..."