@bmanifold fixed a few instances in #3739 but I went ahead and replaced all of them, once we merge it and rebase #3739 on top of it the diff should be minimal.