Numerous improvements to join-existing implementation.