Cleaned up code, comments and headlines re recent find/replace-all commands.