FYI, these changes were actually necessary to get the "accounted" pattern to even work.  That's not actually in the branch now and we may or may not use those patterns as we have discussed, but I thought we do still want these changes either way.