Will that `if` be removed in the future, now that `s` cannot be `NULL`?