Sam Jaffe 344bad7fe2 refactor: macro cleanup hai 1 mes
..
jvalidate 344bad7fe2 refactor: macro cleanup hai 1 mes