Fix remaining references to Rect::Null