Move draw_samples to end of MSM class code block to clean up diff.