Derek Foreman authored Feb 08, 2022 and Marius Vlad committed Sep 18, 2023

Most of these don't use the parameter that changes at all, but some get
a nice simplification.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>