Refactor handling of monitored beacons vs hardware beacons.