Nullability cleanups.