Make nil handling more explicit.