Handle "is not None" and "is None" and do better on "continue", and "if not"