No need for a `null` check here any more?