AS-15 Improve default arguments implementation