Oh, I see now... I got distracted by the extra diff. I guess there's no strong need to change it, although it does look kinda silly.

(Maybe you could move this back to being before `visit_pat`?)