Removed '== None' warnings.