Replace use of OR in guard with AND