Refactor slightly server-side beacon code to make implementing server-generated beacons easier.