8223163: Better pattern recognition
Reviewed-by: ahgross, bchristi, jeff, rhalade, rriggs, smarks