Ensure :default-service is respected in tasks

Any default service that has been configure should take precedence.