Somewhat cleaned up scope joiners. It is not perfect, but it will have to
do for now. #186