Nested discovery fixes

Sorry for the lack of tests.  Hopefully I'll get to this tomorrow.
My concern here is in the `[[], [], [], ..., [something]]` problem. 

We'd like to choose something that is robust to future undetected data.  In practice I expect to see something eventually.