Fixed problems of ordering regarding host discovery and topology
management.

Now I really want to dance.