Even more NFA stuff. Even closer. Also changed NFAFactory.