Function param improvement

Less regex, more correct label visiting