Slightly change offset counting in macros.