Made esw/with-covered-windows non-recursive