agent: Fixing merge of CheckUpdateInterval
agent: Cleanup handling of defer checks