Janitorial work... (Two small code cleanups)

1. Call the ServiceCollection.AddXxx methods with fewer generic arguments now that the DI APIs have been updated to allow this.
2. Stop passing in CancellationToken.None where not required because of default argument.