Clean up whitespace and scope iterator var.