Follow up to MR !1929, which brought over the basics. The old CI had grown fairly messy, so we don’t want to duplicate it, but we’re still missing quite a few things in the new CI.