Cleanup checking of null/undefined