Improving struct support.