Cleaned up the WinRT provider classes.