Migrate Static to Wrapper by @dotnet · Skillet