>Fix PR 18159 (header was using _T as a template parameter) and also >perform a number of formatting changes. This looks good, can you check it in please? -benjamin