Improving Compositional Generalization in Math Word Problem Solving