Nested discovery fixes

Sorry for the lack of tests.  Hopefully I'll get to this tomorrow.
Perhaps, we would need to ensure that Blaze supports this as well.