Move some soap options as const