A few more cleanups and minor fixes to the heartbeat code
A few more cleanups and minor fixes to the heartbeat code

freedesktop-unofficial-mirror/telepathy__telepathy-rakia,freedesktop-unofficial-mirror/telepathy__telepathy-rakia,freedesktop-unofficial-mirror/telepathy__telepathy-rakia