Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, I guess I didn't want to clean that up last time around, but we should just use np._NoValue it seems to me...
Anyway, doesn't matter for this.

(I don't really think this should be backported -- I can say that once every few months, right? :).)