We can change the logic subtly and reduce replication of properties. Also set visibility to improve accessibility.
Signed-off-by: Martyn Welch martyn.welch@collabora.com