No longer need the `null` checks here if they're not nullable? And if the _are_ still nullable, put the annotations back?