diff-memberships: cleanup to make it more useable