Various improvements.

Please let me know if you require any changes.

Thanks for the plugin.
Thanks for pointing it.
Now I see it's used in the assertion of the equality of `ServiceInfo`s :smile: