Small clean-up of the Sunroof type class.