Enable fail-safe clock monitor.  Revamp state tracking.