Hand-merged refactor of server launch/client start code