I'm not really convinced this patch is really worth the effort, but no real objections.
This is correct, but I find it confusion. In this case I would really prefer to use the macro twice.
I see we already use this in some places, but to me this change isn't an improvement.
How did you detect these places to adjust? It seems there are more places.
This one can be changed too.