Grammar changes for new socket connection options.