Server: Minor refactoring.