Fixes in window size functions around Bug#16430 and Bug#16470.