Small cleanup in compiling server code