Remove references to OpamArg