The pattern we're matching can have zero or one p. Be more careful to match exactly that. Slight revision of #39730