Actually I'm not 100% sure, but probably yes. I would still vote for removing these two macros.