Some more comment cleanup on generators