Fix argument enummeration/iteration detetction