diff --git a/src/fst/morphology/affixes/verb_inner_affixes.lexc b/src/fst/morphology/affixes/verb_inner_affixes.lexc
index e23619c..279b3db 100644
--- a/src/fst/morphology/affixes/verb_inner_affixes.lexc
+++ b/src/fst/morphology/affixes/verb_inner_affixes.lexc
@@ -494,13 +494,13 @@ LEXICON ni-IPFV-AFF-InnerPrefix
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ní    #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@níni  #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@iíni  #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@      #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@í     #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@      #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@      #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@í     #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@í     #;
 
 LEXICON ni-IPFV-AFF-MiddlePrefix
 ! Three forms of 2SG ni-IPFV -- ní-, níni-, and íni- -- are attested and freely
@@ -515,19 +515,19 @@ LEXICON ni-IPFV-AFF-MiddlePrefix
 ! marking is present, we proceed to a more restrictive continuation where
 ! only ní- is defined for 2SG inflection.  Otherwise, we can reuse the existing
 ! inner prefix TAMA chunk forms.
-@R.OBJECTPERSON@                             ni-IPFV-AFF-MiddlePrefix-DObj;
-@D.OBJECTPERSON@                             ni-IPFV-AFF-InnerPrefix;
+@R.DIRECTOBJECTPRESENT.ON@                   ni-IPFV-AFF-MiddlePrefix-DObj;
+@D.DIRECTOBJECTPRESENT@                      ni-IPFV-AFF-InnerPrefix;          
 
 LEXICON ni-IPFV-AFF-MiddlePrefix-DObj
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@ní    #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@      #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@í     #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@      #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@      #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@í     #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@í     #;
 
 LEXICON ni-IPFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -560,28 +560,28 @@ LEXICON nis-IPFV-AFF-InnerPrefix
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@nís   #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@nínis #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@iínis #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@is    #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ís    #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@s     #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s     #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ís    #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ís    #;
 
 LEXICON nis-IPFV-AFF-MiddlePrefix
-@R.OBJECTPERSON@                             nis-IPFV-AFF-MiddlePrefix-DObj;
-@D.OBJECTPERSON@                             nis-IPFV-AFF-InnerPrefix;
+@R.DIRECTOBJECTPRESENT.ON@                   nis-IPFV-AFF-MiddlePrefix-DObj;
+@D.DIRECTOBJECTPRESENT@                      nis-IPFV-AFF-InnerPrefix;          
 
 LEXICON nis-IPFV-AFF-MiddlePrefix-DObj
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@nís   #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@is    #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ís    #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@s     #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@s     #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ís    #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ís    #;
 
 LEXICON nis-IPFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -599,13 +599,13 @@ LEXICON nii-IPFV-AFF-NoPrefix
 ! FIXME: no documentation for this form; dummy values below
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@nii   #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ii    #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@nii   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ii    #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ii    #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@nii   #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@nii   #;
 
 LEXICON nii-IPFV-AFF-InnerPrefix
 ! Three forms of 2SG nii-IPFV after an inner prefix are attested and freely
@@ -624,19 +624,19 @@ LEXICON nii-IPFV-AFF-InnerPrefix
 @R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@íí    #;
 
 LEXICON nii-IPFV-AFF-MiddlePrefix
-@R.OBJECTPERSON@                             nii-IPFV-AFF-MiddlePrefix-DObj;
-@D.OBJECTPERSON@                             nii-IPFV-AFF-InnerPrefix;
+@R.DIRECTOBJECTPRESENT.ON@                   nii-IPFV-AFF-MiddlePrefix-DObj;
+@D.DIRECTOBJECTPRESENT@                      nii-IPFV-AFF-InnerPrefix;          
 
 LEXICON nii-IPFV-AFF-MiddlePrefix-DObj
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.SG@níí   #;
-@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@ii    #;
+@U.SUBJECTPERSON.3@@U.SUBJECTNUMBER.SG@íí    #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGPLUME@naà  #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.BIGCROW@niì   #;
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
-@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@ii    #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@ii    #;
+@R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@íí    #;
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@íí    #;
 
 LEXICON nii-IPFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.SG@nis   #;
@@ -810,7 +810,7 @@ LEXICON nii-PFV-AFF-OuterPrefix
 @U.SUBJECTPERSON.1@@U.SUBJECTNUMBER.PL@@U.DIALECT.CROWCHIEF@niì #;
 @U.SUBJECTPERSON.2@@U.SUBJECTNUMBER.PL@nas2  #;
 @R.SUBJECTPERSON.3@@R.SUBJECTNUMBER.PL@íí    #;
-@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@íí    #; 
+@R.SUBJECTPERSON.4@@R.SUBJECTNUMBER.SG@íí    #;
 
 
 !