Use the helper we have for these, rather than open-coding. This commit is not believed to result in any functional changes. Signed-off-by: Daniel Stone <daniels@collabora.com>