Make code look more like the implementation in vserverimpl.c. Should really