Update CodeGenerator so that CanDelete is sorted consistently so that there aren't random diffs just due to unsorted stuff