Just a quick update: I tested the new discovery code with your configuration file this morning, and it worked fine.