Replaced all ad-hoc read-only macros with the new shared one.