Random iterating-related fixes.