Fixed argument extraction