further work on extracting definitions (other than affixes seems to work), minor refactoring
further work on extracting definitions (other than affixes seems to work), minor refactoring

Wilfred/ReVo-utilities,Wilfred/ReVo-utilities,muravjov/ReVo-utilities,Wilfred/ReVo-utilities