No more horrible macro hacks.