Use null instead of undefined in a couple places.