Fix overzealous search/replace