Replaced even more Rectangle by Size when only the size mattered.