tidyups on member_roles - also in 4.4