[FOLD] Tidy up canonical ctor