Rework JOIN handler to make keys, apass, and upass consistent.