Update type-checking to support cross-window objects