Not a change you made here, but None seems like not a special enough sentinel. A small class that is uniquely pickle-able? We can fix this later, though.