Use Cloudsmith in more places, where possible (#2786)