[DynamicTest] cosmetic refactoring to kill code that killed dynamic benefit.