Minor cleanup of auto vs manual data feed.