Bug 18124: [Follow-up] Handle default parameters in a sub