Beginning clean-up of membership functionality in support of saved-search and CRM...