[presence] [wip] Cleanups and fixes.