AccountsService: Fix splitting, use auto-deps