[PATCH 7/8] temporary fixups to shorthand macros, still need to improve further