* Extract the logic for a failed recheck into a method
This will allow us to simplify the logic that calls it.
* Remove unneeded log items
These are already known at the time of logging due to the surrounding
logic.
* Remove now-unneeded initial 'all is ok' check in DeviceListener