Greatly improved the way unit rules and word classes are handled.