Is there a guarantee that `extra` is not `None` here?