* Turned ugly if/else into a switch.
* Re-introduce the asserts in Servent. They must not happen.