Fix type narrowing of == None and in (None,) conditions (#15760)

Fix type narrowing of == None and in (None,) conditions (#15760) #2586