Merged the latest Chicken macros cleanups