More word cleanup. Add YES rule.