f8ca784737
I missed a few things when this was initially merged. No functional changes. Signed-off-by: Derek Foreman <derek.foreman@collabora.com>