More refactoring. Fixes federated disco#info issue.