Bits of cleanup.
Fixes bad find/replace.