Small refactorings of the services to reduce overhead.