server: properly use OrdDict to store server definitions