More == None or != None fixes.