Merge pull request #2839 from benjaminpjones/window-as-not-any

Merge pull request #2839 from benjaminpjones/window-as-not-any #3246