Refactor, extract expanded_noun_util()
Refactor, extract expanded_noun_util()

Make noun expansions easier to handle by extracting the common logic
between genders into a new helper function.

aevri/prospatho,aevri/prospatho