Commit ee18ae3b76bce1d9dafcfdcc0bb049e099120c61

Behdad Esfahbod 2022-08-02T12:56:06

[avar] Minor move code around