- Restore some SANITY around nullability annotations