update macros to use helper functions

This commit is contained in:
2023-03-01 17:49:41 -06:00
parent 821d2f36f9
commit b1d7a70185
7 changed files with 82 additions and 206 deletions
File diff suppressed because one or more lines are too long