Some missed comments for cleanup...