Thanks for all the input, guys. Since the aggregate-return check was removed from Travis, should I still go ahead and make the small changes for this PR? Do you have a preference on returning small structs/pointers @b4n? Either way is fine with me, I'm just lazy.