Fix PR8365 by adding a more specialized Pat that checks if an 'and' with