arkon 22c828da76 Minor cleanup
Mostly just addressing comments from #8452

(cherry picked from commit b1ccebf329e9a9d77894b9d4ff06aeb9d7317acf)
2022-11-16 13:52:29 -05:00
..
2022-11-16 13:52:29 -05:00