rework-visit

Rework declaration visitor utility