Improving Compositional Generalization with Latent Structure and Data Augmentation — arXiv2