Reboot handler cleanup

Reading this, I'd definitely feel more comfortable with a test like:
`if time-of-last-boot < time-of-reboot-requested` (with `time-of-last-boot = now - uptime`)