partial fix for Issue 5570

Partial in that it doesn't solve the problem for returning structs of sizes 3,5-7,9-15