r158: Fix wrong number of clean/saveable windows