(maint) Remove default value of service-wait since it is now unused.