Some refactoring. Preparation for support of varArgs