server descriptor: formatting (part 3)

This has a similar structure and purpose to !310 (merged).

CC @nickm (who may wish to steal review).

This is a sizeable chunk, but doesn't do the whole of this file.