More clean-up in closed-class word list