container: use new, fewer states in Heartbeat and state machine