Rework how we handle cli/conf options