Replace some more || with or