I'm unsure about how these macros where suppose to be used. With these changes they can be used as a shorthand for keys in most api calls (not queries).