Fix #717. Refactor more roles() to release_roles()