Indeed, we could replace `None` by `[]` everywhere on this diff so we are sure that it won't happen, since it won't change the actual behavior.