Looks good to me.
It seems this macro is not used anywhere, and I'd prefer leave it as is.
Ditto.
Odd, no idea why that got removed.
Same here...