This is more explicit and correctly handles some edge cases

The latter is more explicit, correctly handles some edge cases, and helps tag places in the code where we should look into replacing null with undefined.

#70352