Overzealous search & replace