use `if extra is not None`?