Simplify and enhance client/server config file section.