[ADT] Attempt to appease another MSVC oddity by moving the injected
class name usage into a context we can put typename on it.