clc: Improve initialization and get rid of some use-after-free

This is a handful of patches we've been carrying in the rusticl tree along with a couple of mine, one of which is based on a bug found and reported in !15437 (merged)