Erik Faye-Lund authored May 08, 2023 and Marge Bot committed Jun 05, 2023

This makes the code a bit less verbose, so let's use the helpers.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <!23393>