Fleshed out Join/Duplicate refactoring for Indexed classes