refactoring multiplicity analysis

No match.