Pure refactoring to reduce statement lengths. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>