Cleanups so we don't hammer all potential masquerade hosts immediately on startup #1707