Fix generating arguments
Handle nested comments