Switch this patch to simply make commonOpts public