Updated conventional shorthand macros