Code nits - get rid of '== NULL' / '!= NULL'