Since P0522R0 changes the behavior of some well-formed code, I think we want a feature-test macro for it. Since for N4268 we used __cpp_nontype_template_args, maybe __cpp_template_template_args? Jason