Commit 0b2c514fb48b26e2c8fc915b3702ba1b2c8b2b5e

Behdad Esfahbod 2022-01-12T11:20:58

More macro cleanup