Converted remaining managers to all use dependency injection.