No longer broken

Also, there is some map and set code atop server2.c that could be
helpful