PromoteSimpleStructs & PromoteReturnedStructs: Fix more bugs exposed by bugpoint.