diff --git a/src/fst/morphology/affixes/verb_outer_affixes.lexc b/src/fst/morphology/affixes/verb_outer_affixes.lexc
index 50f6d4c..f41184d 100644
--- a/src/fst/morphology/affixes/verb_outer_affixes.lexc
+++ b/src/fst/morphology/affixes/verb_outer_affixes.lexc
@@ -1,4 +1,4 @@
-Multichar_Symbols @D.OBJECTPERSON@ @D.PREFIX@ @D.SUBJECTPERSON.3@ @D.VALENCE.TRANSITIVE@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.MIDDLE@ @R.DISTRIBUTIVE.OFF@ @R.DISTRIBUTIVE.ON@ @R.OBJECTNUMBER.PL@ @R.OBJECTNUMBER.SG@ @R.OBJECTPERSON.1@ @R.OBJECTPERSON.2@ @R.OBJECTPERSON.3@ @R.OBJECTPERSON.4@ @R.OBJECTPERSON.RECIP@ @R.OBJECTPERSON.REFL@ @R.PREFIX.INNER@ @R.PREFIX.MIDDLE@ @R.PREFIX.OUTER@ @R.SUBJECTNUMBER.PL@ @R.SUBJECTNUMBER.SG@ @R.SUBJECTPERSON.3@ @R.SUBJECTPERSON.4@ @U.ASPECT.IPFV@ @U.ASPECT.PFV@ @U.ASPECT.POT@ @U.ASPECT.PROG@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.RECIP@ @U.OBJECTPERSON.REFL@ @U.OBJECTPERSON.INDEF@ @U.PREFIX.OUTER@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.TAMA.%0@ @U.TAMA.i@ @U.TAMA.isi@ @U.TAMA.ni@ @U.TAMA.si@ @U.TAMA.yi-a@ @U.TAMA.yi-y@ @U.TAMA.yi@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.TRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.OO-EXPERIENCER@ @U.OBLIQUENUMBER.SG@ @U.OBLIQUENUMBER.PL@ @U.OBLIQUEPERSON.1@ @U.OBLIQUEPERSON.2@ @U.OBLIQUEPERSON.3@ @U.OBLIQUEPERSON.4@ @R.OBJECTPERSON.4@ @D.OBJECTPERSON.4@ @D.SUBJECTPERSON.4@ @P.PREFIX.OUTER@ @U.OBJECTPERSON.AREAL@ @U.OBLIQUEPERSON.AREAL@ @U.OBLIQUEPERSON.REFL@ @U.VALENCE.DO-EXPERIENCER@ à2
+Multichar_Symbols @D.OBJECTNUMBER.PL@ @D.OBJECTPERSON.4@ @D.OBJECTPERSON.AREAL@ @D.OBJECTPERSON.INDEF@ @D.OBLIQUENUMBER.PL@ @D.OBLIQUEPERSON.4@ @D.OBLIQUEPERSON.AREAL@ @D.SUBJECTPERSON.4@ @P.DISTRIBUTIVE.OFF@ @P.DISTRIBUTIVE.ON@ @P.PREFIX.OUTER@ @U.OBJECTNUMBER.PL@ @U.OBJECTNUMBER.SG@ @U.OBJECTPERSON.1@ @U.OBJECTPERSON.2@ @U.OBJECTPERSON.3@ @U.OBJECTPERSON.4@ @U.OBJECTPERSON.AREAL@ @U.OBJECTPERSON.INDEF@ @U.OBJECTPERSON.REFL@ @U.OBLIQUENUMBER.PL@ @U.OBLIQUENUMBER.SG@ @U.OBLIQUEPERSON.1@ @U.OBLIQUEPERSON.2@ @U.OBLIQUEPERSON.3@ @U.OBLIQUEPERSON.4@ @U.OBLIQUEPERSON.AREAL@ @U.OBLIQUEPERSON.REFL@ @U.SUBJECTNUMBER.PL@ @U.SUBJECTNUMBER.SG@ @U.SUBJECTPERSON.1@ @U.SUBJECTPERSON.2@ @U.SUBJECTPERSON.3@ @U.SUBJECTPERSON.4@ @U.VALENCE.DITRANSITIVE@ @U.VALENCE.DO-EXPERIENCER@ @U.VALENCE.IMPERSONAL@ @U.VALENCE.INTRANSITIVE@ @U.VALENCE.OBLIQUEOBJECT@ @U.VALENCE.OO-EXPERIENCER@ @U.VALENCE.TRANSITIVE@ à2
 
 LEXICON Root
 
@@ -114,24 +114,42 @@ LEXICON SubjectAndObliqueObject
 
 
 LEXICON SubjectDirectObjectOrObliqueObject
-!
-! FIXME FROMHERE: make sure this only provides one pathway out per combination
-! of subject, direct object, and oblique object conditions!
-!
-@U.SUBJECTNUMBER.SG@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.SG@     NoDistributive;
-@U.SUBJECTNUMBER.SG@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.PL@       Distributive;
-@U.SUBJECTNUMBER.SG@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.SG@       Distributive;
-@U.SUBJECTNUMBER.SG@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.PL@       Distributive;
-
-@U.SUBJECTNUMBER.PL@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.SG@       Distributive;
-@U.SUBJECTNUMBER.PL@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.PL@       Distributive;
-@U.SUBJECTNUMBER.PL@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.SG@       Distributive;
-@U.SUBJECTNUMBER.PL@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.PL@       Distributive;
-
-!@U.SUBJECTPERSON.4@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.SG@        Distributive;
-!@U.SUBJECTPERSON.4@@U.OBJECTNUMBER.SG@@U.OBLIQUENUMBER.PL@        Distributive;
-!@U.SUBJECTPERSON.4@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.SG@        Distributive;
-!@U.SUBJECTPERSON.4@@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.PL@        Distributive;
+
+! Distributives are possible with all plural and 4SG subjects.
+@U.SUBJECTNUMBER.PL@                                              Distributive;
+@U.SUBJECTNUMBER.SG@@U.SUBJECTPERSON.4@                           Distributive;
+@U.SUBJECTNUMBER.SG@@D.SUBJECTPERSON.4@            DirectOrObliqueObjectPlural;
+
+LEXICON DirectOrObliqueObjectPlural
+
+! Distributives are possible when either the direct or indirect object is
+! plural.
+@U.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.PL@                           Distributive;
+@U.OBJECTNUMBER.PL@@D.OBLIQUENUMBER.PL@                           Distributive;
+@D.OBJECTNUMBER.PL@@U.OBLIQUENUMBER.PL@                           Distributive;
+@D.OBJECTNUMBER.PL@@D.OBLIQUENUMBER.PL@               DirectOrObliqueObject4SG;
+
+LEXICON DirectOrObliqueObject4SG
+
+! Distributives are possible when the direct or indirect object is 4SG.
+@U.OBJECTPERSON.4@@U.OBLIQUEPERSON.4@                             Distributive;
+@U.OBJECTPERSON.4@@D.OBLIQUEPERSON.4@                             Distributive;
+@D.OBJECTPERSON.4@@U.OBLIQUEPERSON.4@                             Distributive;
+@D.OBJECTPERSON.4@@D.OBLIQUEPERSON.4@               DirectOrObliqueObjectAreal;
+
+LEXICON DirectOrObliqueObjectAreal
+
+! Distributives are possible when the direct or indirect object is areal.
+@U.OBJECTPERSON.AREAL@@U.OBLIQUEPERSON.AREAL@                     Distributive;
+@U.OBJECTPERSON.AREAL@@D.OBLIQUEPERSON.AREAL@                     Distributive;
+@D.OBJECTPERSON.AREAL@@U.OBLIQUEPERSON.AREAL@                     Distributive;
+@D.OBJECTPERSON.AREAL@@D.OBLIQUEPERSON.AREAL@                DirectObjectIndef;
+
+LEXICON DirectObjectIndef
+
+! Distributives are possible when the direct object is indefinite.
+@U.OBJECTPERSON.INDEF@                                            Distributive;
+@D.OBJECTPERSON.INDEF@                                          NoDistributive;
 
 
 LEXICON Distributive