Fixing cruft left over from search and replace