Make comparator work per-window not per-page