More windows changes, never use generic delegates when generating dynamically because of .NET issues