- Swap some nullable annotations (#9696)