Minor cleanup: replace match() by stridx() when appropriate.