I just added support for both macros, which makes keeping track of related array data much easier