Clean up overzealous find/replace.