More cleanup of closed-class word list in naming convention script