Add comment handling.