Remove (most) of the tw2 for straight forms.