WP-628 More cleanup of membership code
Work in progress checkpoint