Cleanup comparisons to None