Clean up some join code, make join stacks better