Untemplatize Celestial and Vessel.