Clean up for Windows spec deprecation warnings.