I don't think we want to add the `?` to these methods just yet. It's liable to be referenced throughout the code, so we don't want to break any of that.