Improving support for the Membership plugin, cleaning up a lot of work.