Minor changes as I work on the Avahi code.