Fix possible race condition on Watchdog::delay. Clean up formatting.