Replaced O_XXX by +o-xxx+.