Add missing substitutes to yarn macros