SI-6701, SI-7304, SI-6489, variable arity definitions refactoring

review by @retronym