Some refactoring in 'Arguments' implementation