Make SafeNone less hacky