Even more Conway cleanup.