Move Watchdog to a polymorphic variant