[CLC-1518] More finalizer conversion to match new convention