group/%/%/admin/people membership 'state' is not set correctly

First, when I check/select the test user and submit 'Approve membership of selected users', There is a WSOD. In another thread to this group, I show the problem - http://drupal.org/node/1102522 - an extra argument sent to og_group. Putting in my fix for that, allows submittal and the return message shows success, but the user still has a status of 'Pending' because of the following bug.

When submitting an 'approve' option for a group member state, the correct, existing state value is not used. Debugging the code gives the following information:
When the code progresses to the og_group function, a $wrapper variable is set (in og.module, around line 1490 -- I have some dd() calls mixed in...). This gives me the correct value for the group member state, e.g.

og_group - $wrapper: Array
(
    [0] => Array
        (
            [gid] => 7
            [state] => 2
            [created] => 1300884090
        )

)

So, the correct state is 2 or OG_STATE_PENDING which is what exists in the DB record. When we get further down in the og_group function, there is a call to og_get_group_membership. This returns $group_membership information, but the state is always set to 1 or OG_STATE_ACTIVE. Following this through to the construction of the EntityOgMembership object shows that no array of values (the first arg to the constructor) is being sent, so the default values in the constructor are used. In there, state is always going to be OG_STATE_ACTIVE.

I would think the test in og_group that determines if a save is necessary where there currently is:

if ($group_membership->state != $state || $group_membership->name != $values['membership type']) {

would be better to compare against the previous variable $wrapper, so we would have something like:

if ($wrapper[0]['state'] == $state || $group_membership->name != $values['membership type']) {

What do you think? Otherwise I don't see how it can succeed when trying to approve a pending user.