Second pass at revamping find/replace.